From eb8f23f90f5b899faa56388b49192a500a8149c3 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 13 Jan 2006 10:03:31 +0000 Subject: [PATCH] don't animate the expander arrows if gtk-enable-animations is FALSE (bug 2006-01-13 Michael Natterer * gtk/gtktreeview.c (gtk_tree_view_real_expand_row) (gtk_tree_view_real_collapse_row): don't animate the expander arrows if gtk-enable-animations is FALSE (bug #142582). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtktreeview.c | 10 ++++++++++ 3 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index 39b88e6536..5163ea3afb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-13 Michael Natterer + + * gtk/gtktreeview.c (gtk_tree_view_real_expand_row) + (gtk_tree_view_real_collapse_row): don't animate the expander + arrows if gtk-enable-animations is FALSE (bug #142582). + 2006-01-12 Matthias Clasen * gtk/gtknotebook.c: Replace hardcoded values for tab-overlap and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 39b88e6536..5163ea3afb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-01-13 Michael Natterer + + * gtk/gtktreeview.c (gtk_tree_view_real_expand_row) + (gtk_tree_view_real_collapse_row): don't animate the expander + arrows if gtk-enable-animations is FALSE (bug #142582). + 2006-01-12 Matthias Clasen * gtk/gtknotebook.c: Replace hardcoded values for tab-overlap and diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 4de65e394f..d9587bc281 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -10740,6 +10740,11 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view, GtkTreeIter temp; gboolean expand; + if (animate) + g_object_get (gtk_widget_get_settings (GTK_WIDGET (tree_view)), + "gtk-enable-animations", &animate, + NULL); + remove_auto_expand_timeout (tree_view); if (node->children && !open_all) @@ -10885,6 +10890,11 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view, GList *list; GdkWindow *child, *parent; + if (animate) + g_object_get (gtk_widget_get_settings (GTK_WIDGET (tree_view)), + "gtk-enable-animations", &animate, + NULL); + remove_auto_expand_timeout (tree_view); if (node->children == NULL) -- 2.30.2